fix and add more unit-tests