removed more tests. Added some
fix test
split out functions
more clean up