Cleanup/optimise Test