Moved org-tests to stubs