Test cleanups

I've made a few commits to cleanup the existing unit tests, each commit should be reviewed separately. I've replaced all of the mocks/stubs by existing test apis, because I feel that it's better to use official testing tools rather than creating mocks that we need to maintain (and that may give us false assumptions, especially if we forget to keep them up to date).