more tests; cleanup comments