[SQUASH ME] nomac: take tests out of rename
[SQUASH ME] tests: apply nomac rename to tests