Better import
More testdata