WIP - Fixing spec with new working environment