added ws6
added Tests
added Tests
improved tests