Continued work on single valued tests.