Respect the numeric arg in barfing
Fix some tests