Try to see if we can get these tests working...