fix tests
Merge remote-tracking branch 'origin/spec' into spec