Refactoring of tests demonstration
One = one file, rename variables.
Add new WS tests