Fixes for several failing tests that were not updated to reflect new content, as well as a bug identified by tests