adding #define switches to turn off/on certain test parts.