* Remove getattr and update tests * Apply suggestion for test from PR review * Make constants capitalized