ADEN-435 add post switch cases to tests
Merge branch 'ADEN-435-post-switch-ads'