Revert "JDF-640 Updated functional tests"

This reverts commit d6f2d6ca3aa80a8c0cb767b4a8f6161e86b51d82.