Fixes unit tests to remove non necessary tests and make names match to controllers and services