Add acceptance test for TNL-3096

Adress comments on pull request

Fix test failing and img issue

Modify tests