Broken factory broke the build :-(

Updated unit test too.