finish production wiring
fix test