Revert some irrelevant code style changes to tests