Extend tests to cover images / instances controllers