fixing model-impl and model-intest tests...