Added some of the tests back.