Fix bulkedit + tests

http://ralph.allegrogroup.com/buildbot/builders/unittest-ralph-wmatyskiewicz/builds/214