Some updates to test cases