Adding tests to support MakeExplicit