Added some tests back in