You could add a few more checks for bpp and bytes_per_line in test_bitmap_data(). Most of those would be inside the format-specific paths.
I've sent try 5 with some more tests and also added odd/even width tests for palettized textures, and format-specific depth/bpp tests along with the rest of the changes.