Fixed WS unit tests.
Fixed WS device/save method.