More Test fixes for #308