Adapted Host file for testing, refactored services & test helpers