Completed tests
Merge pull request #2 from im-auld/step2

Step2