more cleanup
get tests beaten into shape