ticket:72 Fixed tests