Added tests back. Need to strip these from mock setup after verification