Move dummy objects to factories. Fix tests.