Made the tests pass and making them self-contained
Merge pull request #90 from FrozenCow/selfcontained_tests

Made the tests pass and making each test self-contained