Merge pull request #345 from reaperhulk/mark-tests

Add test marks for various backend functionality
Merge branch 'master' into mark-tests-2

* master: