Cleanup and add tests
Handle zero service announcements