Improved helper functions
Improved facade tests
More facade test tweaks
Improved service provider tests