Remove #defines as suspected cause of multiple bizarre test failures