Cleanup. 
Test name refined, constants renamed.