Fix and enrich test a bit