Fixing failing tests from modifications and tweaks to correct missing data in the UI