Resolving drush issues and decoupling functional tests