Refactored test methods to static methods
Several things. It’s 1 am, you know?