[MAT-387] Terminal factories - compiles but tests fail