ADDED: more tests
FIXED: typos