Work in progress to get these tests running against devcloud4

Can't hurt but probably not ready for merge yet either.