Add more tests for AND-OR masking
Increase test coverage of image.py to 100%