Comments to Contributions
Refractored and added contribution tests