fix typo
nice up code and tests
nice up code and tests