Fixed some issues caused by WS refactorings, nonetheless the test is still not working :-(