added more terminal player tests, fixed bug in cleanup