Finished second test mid-refactoring