adding tests
Merge pull request #1 from mplaza/melaniebranch

adding tests