Mark expected failures as such
Tweak tests
Restore (more) correct implementation for endpoint