Continue on Images API

Also contains various changes made in the test infrastructure