Put other tests back in