Merge pull request #6554 from tianon/fix-dyntest

Fix dyntest and rename it to dyntest-unit to match the test-unit rename