minor test changes --KW