Refactor- tests changed to become more readable