Fix bugs with fixtures not starting and ending for correct classes.

[colinrg]

A problem has been reported with Fixtures not functioning correctly, which needs investigating and fixing.