comprehensive test 1 complete, cleaned up code