Fixed two more sets of tests not running under minitest

Same kind of problem as was fixed in
e840d7fedd180929d089f17d6d6e322e672780f0. This brings the total number
of assertions from 759 back to 1021.