Added test coverage
Moved names to CONSTANT