Reversed some changes; functional tests working in CircleCI now