Unit test improvements. Removed partial web client