small fix and more test cases