Factory: test & fixes via test