Doc and Test fixes