xs_core tests: remove last direct usage of more in options, remove deprecated tests for removed code