Updating copy
Added some tests
Added tests and merged successfully