Test reorganization + more notes.