renamed CalculatioTests and extra code clean up