Foundations lab tune up

Starting back where https://github.com/github/training-kit/pull/238 left before needing to target release branch 1.7.0 rather in place of master.