Fix and Test for #32

A little concerned about using arbitrary wait.. Perhaps we should use a custom client properties and up the timeout?