Update code + unit test

Add unit test + Change command code and general code configuration.