Adjusting failing tests