More unit-tests!