Test fixes, and applying rubocop to them.