[BUG #7654] added unit tests