Adds more test coverage