Added all tests back