Merge "Add config fixture support to unit tests"