Readded rename test, cleanup