Rename control and remove obsolete tests.