Refactored the structore of the rest-tests by removing the functional out of the package