Fix remaining test issues