Added example usages for all options
Added tests to makefile
Cleanup unused files