added sample command
updated unit tests
code cleanup