moved test of calculate to seperate file
pushing joined data