EMMA changes

Master test 3 working with testSelection 1; not with 2, for some reason