Documentation, test adjusts