Commando "update" + unit tests (deel 1)