Adding missing test coverage