Fix test, inline method and fix typo