removed some test cruft