Unit tests working

(sorflex: another try, the commits for data are there but should be nothing in them)