FIXED compile errors in tests