Remove override and add file test on equality