Removed files not required in new rest api and added model unit tests