Revert to using #define. Add test constants