Last image tests, fixed implementations