Fixed all of @iHiDs broken tests

:racehorse: :8ball: :dancers: