bug 945748 - make tests less "magical"

and more readable..