add test cases
update expectations