more tests, drop the root option, clean up internal notes