Updating/fixing test cases