ADD: added unit tests