ticket:68 Fixed tests