and fix relevant test