#47 Test and fix complete bulk