Added tests back in