Merge "Add unit tests for debug"