More tests, cleanup comments