refactor(tests): harden up some tests and comments