Tidy up for testing