Fixed some tests; made other tests (at least to run)
TODO: remove the dataimport handler (and its tests)
TODO: we are getting insane cache usage (and few other errors)