ticket:1 for #1 Tests fixed.