Test fixes
Fixing specs