updated tests
more tests