Revert "fixed more functional tests"

This reverts commit 90505dea8e9a2aa6fb021ee02e6edceed638cd86.