[#6595] Clean up tests

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