added tests
added tests
bug fix