Revert "Revert "end of tests""

This reverts commit 5ab691a4a51cf7ef1d9629c92a51e9115d88c9fa.