QuickFixes for OVERRIDDING_FINAL_MEMBER and FINAL_UPPER_BOUND

I did some renames and in case of small test files git marked them as deleted/added rather than renamed.