Add web services and more tests