Reverted some unnecessary changes to unit tests that turned out to no longer be relevant.