Adds more tests. Move expected output values into test fixtures.
Merge pull request #11 from hsume2/hsume2/test_cleanup

Adds more tests. Move expected output values into test fixtures.