more tests adapted