Fixed var names
Fixed copy tests