Finished fixing bugs in test cases for #230. Only remaining failures are due to known regression #231.