Fix some of the RightScale integration tests