Bug 16607: Remove CPL/MPL from two unit tests