Update tests to match changes in last two commits