fix more tests
fix more tests
add a broadcast test