Move tests into own file; add imported edge order