Did some refactoring, tests still passing
Tests throwing strange error