Made tests run faster
Fixed test
Merge remote-tracking branch 'origin/test-cleanup' into dev-gradle