Move and add a test