Added tests of factories