refactor tests
tweak comments