A bit more code cleanup to simplify function names and move logic into services
Add a few basic tests for the Home Service