#2 Remove broadcast module
#2 Basic renovation of tests
Close #2 - Final cleanup