ticket:4 fix tests and style errors