Quick fix in test
Some further corrections.