reorganisation, more tests