Adding more tests anticipating some existing specials.
Simplified value extraction.