#987 Factory: Update tests.