Issue #3458426 by mstrelan, catch, smustgrave: Add int return typehints to protected test helper methods
