Add tests and copy statement timeouts on relocation/organizing