Fixed tests to handle changes from parent branch