Updated test cases to work with changes made in last several commits