Issue #26 - Updated factories to match tag assignment format.