Dynamic test refactor

review c7a43fd to see the changes without the wall of red.