Factory class is no longer static.
Updated a test, they should now all run.