Finished third  test more refactoring