Fixed format of reporting ornery rerolls, added unit test