more todos/dailies test cleanup