Test reorganization and stubs