Rename fixes


Split tests out into multiple files.