unify descriptions, added some tests