fixed some tests, added missing functions to MockService