force natural usage in test
little optimization; fix 'while' loop
trivial: fix typo in comment