update spec to use expect instead of should, fix spec for JRuby