get a test working, put some early checks in remove and rename