Fixes to unit tests so that they pass.
Merge branch 'master' of https://github.com/TeamShadow/shadow.git