cleaned tests up; added correct termination