Removed the Web Test Client
Minor changes