re-added unit tests