Fix race and move system property to all tests