Laptop 2 15-11-13

Tweaked WS smoke tests