Renamed constant and added some more tests for branch coverage