Restored all tests