Cleaned up an old part of one of the test helper functions