remove now-obsolete harness files
add helper funcs
manually fix a few tests