Refactor new specs.

- Refactor specs so they pass.
- Cleanup and format.
- Only have gem dependencies in gemspec.