Rework tests ahead of adding functionality
Remove unused method
Make class methods instance methods

I couldn't see any reason why these methods in particular were class
methods.