czaheri added unit tests