test cases, cleanup
more cleanup
cleanup for make check