Clean-up of initial benchmark tests