[issue #353] [Fixed] fixes the test and adds the more test cases