Gsoc

Fix Test and Merge File.