Reworked any unit test that could be templated to improve the maintainability of the unit tests.