fixing some tests in model-impl (by modifying samples and small improvements in rawType implementation etc.)