more tests
more tests ported over