Some more fixes in test-code