Last? tidy up before testing