REF: add missing keyword, more unittests