Get functional tests running

Changes to fix errors when running functional tests as part of the build. 
Some steps have been commented out where they are not passing and can be addressed later.
Still not running on headless vagrant server without Xvfb.