More unit-tests