Setup fixture for drop database for unit test which involve database interaction.
Refactor and code cleanup
Added file service support
Refactor code