Unbrittle tests

By using fixtures and removing stubs