Removed original files from testing
Added files from master 1.0 and test code