Merges block test changes.