More test changes - for working with DB