upgrade to rubocop 0.23.0, and improve some tests