[#6821] Fixed failing tests due to last commit refactor

Signed-off-by: Cory Johns <cjohns@slashdotmedia.com>