Let's apply this in every occurrence in the tests.