updated unit-tests