Branch debug and tests