WSOTWO-147: Code cleaned up. Fixed Branch presenter tests.