Change to class level constant and add more tests