minor modification of tests