Edit GT message
Tests reworked