Add a few tests back