Debug, tests for update 2