Fixed the drupal login + tests + cleanup