Renaming unit tests to match renamed ctrls