ticket:1 improved tests