cleaning up clone tests and code