Fixes for remaining tests