@stof updated tests.