Doc and tests cleanup