I still have a couple tests that are related to option changes that I need to fix on the same RB