Removed SpringSource tc Server runtime ids. Adjusted a few more tests