Add image tests and to controller