Removed redundant per-test cleanup

Also closes #886