Fixing issues with spec suite