Clean up services and manager unit tests