~ tests generator fixes