added tests
Merge pull request #7 from salamanders-2014/pair-jennieo23,franscan

added tests