A couple of bug fixes, better handling of negative test instances, and other misc stuff