ticket:2 Some test changes