Finished third  test finished refactoring