Tests still broken but more progress.