Use the new factories for testing
Use the new sentinel object