Follow up from #122: Splitting out test cases to remove most special cases for setup and cleanup in the environment suite.
Removed intermediate record structure; earlier change was causing end_per_testcase to crash, this should be fixed now.
Merge pull request #127 from jkingsbery/master

Clean up after #122