Made test extends from ProjectSpec.
More fixes to flaky tests.