fixed RestrictedFirm model for test in test/models/company.rb.
backported with 'git diff v3.0.3..v3.0.20 test/cases/timestamp_test.rb'.
fixed test in test/template/form_options_helper_test.rb.