Hotfix/rollback header and rspec