Fix conflicting tests
Merge branch 'fix-failing-test' into OR-query-support
Improve formatting