Cleaned up stubs to not break tests for better monitoring of Facet
refactor