Fix tests and better copy