Add clone method, update tests