Cleanup.
Testsuite shortcut. Closes #252.