added some tests back