simplified to just a single _Fixture class

Also, fixes some usages (see test changes).