ticket:9 Fixed tests