Added unit-tests