Added tests back