Fix tests
use PropelColumnTypes instead of hardcoded values
Merge branch '1.2' into survos