Reverted doc and test settings back to original