A few more tweaks, a few more implemented lifecycle methods.
Merge branch 'master' of https://github.com/SeanMcTex/UnitTestsPartTwo