Merge pull request #18 from uoa-group-applications/smock

uncommented some tests
more tests
more tests