Improved test coverage to 100% woo!