Fix Change Treatment Area

- Add test coverage
- Use simple gsub call to redirect to the correct page
Merge remote-tracking branch 'upstream/master'