Revert "Issue #2144669 by Mile23, Nitesh Sethia: Improve/Refactor TestBase Through Expanded Unit Testing" This reverts commit 921317dc.