Small fixes
Prepared test structure