fix tests even more -- (this should work since i pretty much mimic the old behavior now)