fixed stubs and attempted mocks