Stubbed in a few more tests