Improved test coverage :)