reorganisation and tests