3.0 fixture fixes

Fix several open issues related to baking fixtures and tests. See #3199, #3200, #3202