Added filter to copy and updated tests