get all tests working again