Revert "shorter functional testing layer"

This reverts commit 6f981a79dbca8296b724faddb7a09ae26e602945.
ignore long line