final pass of cleaning out bad test crap