restore more tests