Rubocop and other spec fixups

The tests should pass now, in theory!