tests passing w retries, new directories etc.