Getting singleton tests in the right place