Improve GP mutation and unit test