Fix EndPoints tests
Fix v2 typo, cleanup.