Updated doc and test configuration