Finished second test finished refactoring