Wrapped up tests.
Merge branch 'master' of github.com:applyance/server