Fixes for test breakage

Probably dumb, but screw Moose's stack traces :\