More verification
More implementation, and more unit tests enabled