more utility funcs and tests!