Fixes more test problems