Working through the bugs
Implement TryGet queries
Fix test interaction problem