further extending the test coverage and fixing a copy-paste error