Rebased web with passing tests
add extra test option for valves