Fix WS, tests for overview changes.