fix
Merge branch 'fix-test' into sugar-methods