Re-ordered test files to fit to other packages.