Changing the tests directory, seperating unit and functional