Add calculator to tests