Replaced the overly complex "lazy" pytest fixture mechanism with a
simpler declaration syntax.