Adding some tests.
Added some code for web services