updated references to submissionStatus
fixed tests to work with the new submissionStatus logic
Merge branch 'master' into submission_status