extended tests and minor other changes