Fix junit test

Fixes file manager test:

* Include API changes
* Include file upload service on test context
Merge pull request #10 from alediator/junit_test_fixes

Fix junit test