Remove test flag since it's not used much