Get the functional tests passing