Merge "Use master reclass in tests to debug undefined vars"