Add a test for crossmatch
Convert crossmatch to run subtasks