Pushing the work on the tests

Relate to issue #1696