Added test re issue #11
Add more asserts
Merge branch 'master' of github.com:balderdashy/skipper