Clean up on constants for unit tests