Test refactoring

Complete test refactoring to simplify and allow extending for project who use WsClientBundle