some test related changes