Revert "Updated test stubs to reflect recent pull request changes."

This reverts commit 85e5170b6974810d6e39afcd3fe6b17c96b10326.