Fixed the issue with the tests, but at the expense of a dependancy. No SO question needed!