Some more fixes, one test left to fix