Issue #8 - Rewritten Fixture type hierarchy