Greatly improve test coverage