Updated more tests to use scruffy client.