Restore SpecEndpoint, add system test