Various Test fixes