fixed doc builder complains and the test failures