some updates from usage, starting more unit tests