bug951026 - Unit test WIP
Another push