I was not able to get the tests to be green (even before these changes), so I am not entirely sure that this is fully working. @bind-almir could you have a look and let me know if this makes sense? Happy to spend more time writing tests if needed, but i'd love to get the tests on master green first.

Hello @bind-almir, any chance you could have a look at this one?

Thanks

@bind-almir lets get this merged in please! Not every endpoint has an options.