Remove reinitFirm() in FirmConstructorTests, split tests instead

Supersedes #191