remove mocks
plugging drupal because it needs to be standalone testing
fixing indentation
setting methods again
Merge pull request #3 from cordoval/3-i-was-not-done

[Ready] final changes