Re-adding tests from rebase
Merge pull request #8 from irdan/irdan/Jay-forgot-to-pull

Re-adding tests from rebase