Added some more org tests as per stubs