Merge simplified/expanded tests from issue #193 from master.