adpted tests to new interface