We should include a unit test to try to ensure that we don't add features to one environment and forget about the other. Change-Id: I72b1acf8eea4a05e05fed1efeb0663a3eff9278a