Revert "Experimenting with functional test"

This reverts commit d51c136324fa4eb8ca69f5998298ebbad0d516a3.