optimisation tests
merge JG changes