Changed explicit Quo reference to use dom()
Fixed tests that were broken + implemented more mocking