added tests
updated tests