Challenge image field and updated form (Tests done)

Tests are written now, please review :).