some Test fixes