Create UnmodifiedControlsDemo_Test using new API and adjust API