RF: trick git into detecting renamed files
RF: finish rename for git
TEST: update tests