Calvary's $2.5m renovation finished as unit celebrates 60 years