Fix/unittests

Look good before merging?