Code Standards and remove unneeded test