Updated test generator.
Test for #207. Closes #207.