Added a few tests back