Moved collate test to right place