WIP: Renaming top-level signals. Test bench improvements