Merge pull request #1217 from danielstjules/test-framework

WIP: Get test-framework up-to-date with master
Add submission_id column to TestResult, fix failing tests in test_result_test.rb