Decided to leave the GNI as value and testing templates