more tests minor changes