Some small quick fixes for the functional tests - updating related ids and other fixes
Merge branch 'functests' into dev