added more unit-tests