Miscellaneous Changes

Add clone function
Update few tests