Some more fixes and further tests