ticket:13 commit with test and code done