Added test object factory