fixed some tests
Merge branch 'SIG-code' of github.com:svanschooten/genesis into SIG-code