Fix for optimisation - junit still failing