Added some tests back