Fixes for test breakage