typo and more tests.