Completing initial test framework.
Fixing small syntax issue with new options format.