work on bulks, more tests fixed