avoiding NPE on RA
Fixing tests that were eventually failing