fixes
tests reorganised