Refactor spec file to remove some rspec deprecations
Don't namespace ids