added unit tests support