Fix tests and cop