WS Changes

Made test sets WS friendly - removed generics and Lists