Further fixing tests, factory