remove ipdb, uncomment test calculations