Cleaning up for new release

Includes some extra specs to keep coverage up