Made better cmd line interface
Added mocks to manual and sonya di.