Fix broken album/picture tests.