added changes to methods for copy over and added unit tests
fixed merge errors