REFACTORING commandstorage: remove superfluous includes and modify UNIT_TEST macro section