Better tests
Bug fixed by SF - thanks !!!