Some more "Bulk" renaming in the tests
Some more "Bulk" renaming in the app