Repairs a bug, adds a better testing possibility.