add all the markers to the tests
Merge branch 'master' into mark-tests-2

* master:
correct import style
Merge pull request #346 from reaperhulk/mark-tests-2

Add Actual Test Marks