Optimisation of SerialTest