Fixes remaining test code