Re-generate model with propel 1.6.7

Also include some resource consolidation unit tests