Fix define setting and geometry testing

8 files changed