[Andrei,Ronald] added unit tests