Implicit paths back in, but probably not quite right. Renamed directory of the test models.