Whole lotta testdata + model fix