Cosmetics
Cosmetic improvements to fixture testing code