added tests
fixed tests