further test coverage; stricter scoping