Cleanup fixtures and move tests to lab
Merge pull request #3 from tomsteele/tom-edits

Cleanup fixtures and move tests to lab