ticket:1 for #1 tests fixed.