(TK-16) Removed some unnecessary future usages from tests

This commit removes unnecessary future wrappers around code in some of
the shutdown unit tests.