More test constants. Fixed test failures.