More Test fixes