Added some test and object factories.