Added performance tests to aid optimisation