BS-8301 : Fix tests in error on Engine

- Rewrite tests