minor test changes; one test removed