Update factory and usage by scene and game. Update tests.
More test clean up. Fix test runner.