Update old tests so they compile and run
4 files changed