-- added unit tests