More endpoint support plus tests (excluding apps)