Update tests with new options scheme, remove unhelpful benchmarks