Finished refactoring. Back to the same failing tests we had before. Hooray