Changed tests to not use class constants