refactor CQLHelper to extend FilterBuilder
rename spatial filters to match CQL names

- also fix missing call to equals in CQLBuilder
- make tests easier and ensure they actually work