separate bus capacitor and bus gen. Update test cases accordingly.