Reviews test fixes
Make sure objects are fully loaded before filling them in