revert fix to gitlab:test, fix rake spec