few more acceptance test changes