Port last test
more tests