add more tests remove unsued cruft