more tests, minor change of interface