Change to use arg name as placeholder.
Finish initial tests for all classes.