Fixed the Tests and cleaned up the project for SpringMVC and REST