Modifying the dynamic calls to solve Issue #130.
Cleaning test.d up.