Polished test_zoobar* files