Started to fix test suite
Fixed ProxyService
Fixed task handling in tests (I think)