Fix controller tests
Fix integer/decimal regexes