reinstate py.test and remove setUpClass for now