Added more unit-tests

functions to be implemented.