Update tests after cleanup