Fixed rspec deprecation warnings for functional tests