Fix memory management on tests and Remove DefaultServicesTrait