Moved few org tests as per stubs