Added some factory to test