Update to usermanual, new with tests