rename some test files to not use shorthand