rspec fixes and restored the tid hack for prod server