minor cleanup and increasing the timeout on an occassionally failing
test