Add CommandTest
Add Option test
Rename Normal option to private