[#6670] Fix tests

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
11 files changed