Update test cases to conform with refactored design