Add compare-frms tests
Refactor file names