Removed intermediate record structure; earlier change was causing end_per_testcase to crash, this should be fixed now.