Bug #727431 - Merge common factories' code into a superclass