Doc and test changes