Get passing tests
Merge pull request #1 from theodi/feature-tests

Get passing tests