Complete course integration testing
Trying to prevent merge conflicts on this local branch.

Merge branch 'master' into courses_integration_tests
Merge pull request #18 from msh345/courses_integration_tests

Courses integration tests