fixes: replacing unnecessary fakes with mocks in tests