Merge "Reset services before every test"