[minor] fixes in test cases and demo