Modify tests to compile and work.