Trying to rework to test better
Revert "Trying to rework to test better"

This reverts commit 4e66807161970599ce14770d2ee862bd9247d534.
Trying to rework to test better