Merge "Wrap: Jarjar WrapTest to be specific for tests"