update manager and test, remove wiring test
update comments