Undo the hack but keep the test
Populate node with filename to address mixin error reporting