more tests, rename file
remove cruft
add many tests and points