added some unit-tests