simplify tests (here is to the preprocessor macro!)