Improved barfing + tests