Added more unit-tests