Added tests and made another copy change. Please check and merge.