Merge "Revert "Put the right defaults for test lib.""