Updated the on context changed mechanism in the acceptance tests to be
more fool proof