adapt tests to final api