Introduce singular/plural for test fixtures

With singular and plural I can differentiate which factory should be
used to create list of objects and which should be used to create single
objects.

Signed-off-by: Konrad Reiche <konrad.reiche@gmail.com>