After quite some fumbling, fixed both the development import and some tests.