Work in progress on image tests.