port more tests