minor updates and test cases