Remove unused class method
Simplify finder syntax and get rid of class method
Constant names should be capitalized
Filling out missing unit tests