Greatly increased test coverage