Bugs #249 and #296 Unit Test Improvements

Use close approximations to the repro queries supplied for these bugs, in addition to the simple one devised for diagnosis.