Fix the remaining tests so they compile. They probably do not work