Inlined the CreateFixtureFactory method

to simplify.
Improved the build scripts.