Fix test loop theme
Add support of PostGis 2