BRANCH 4.2-DEV: some trivial test changes