Merge "Recalculate user default options for each test"