Revert changes to Controller test files I somehow missed.