Remove todo
Fix non-executing tests
Add service scope assertions