ticket:1 Commented tests