renamed collector class to calculation_collector
made naming changes in collector and moved tests