Add fixture for indicator parameters

There are a few places in this file with some old code and TODOs that can be removed or cleaned up.