Fixing spacing, removing opts, updating Mock Adapter