Cleanup of tests. Back in green