Remove use of deprecated functionaity in some tests.
Update code in demos using deprecated interfaces.
Merge branch 'garth/test-updates-for-interface-changes' into next