Clean up mocks some
Run from options