added more unit tests
added more asserts
added more hardcoded data
added more useful test data and refactored the code a little
Merge pull request #2 from jchrusciel/bug_646

added more unit tests