Left the conditionals about @frequency_base in place. I don't want to have to mess with the TestFactory right now.