Further fixing test coverage (#42)