Fix compile errors in tests