Stubbed some more tests