adjust test names
use Values class consistently
finish header support