WSOTWO-135: Added unit tests for branch/container widget and fixed bugs