[cleanup] Clean up test and use expected data set for assertion
Merge pull request #27 from wallner/cleanup_tests

[cleanup] Clean up test and use expected data set for assertion