reorganised functional tests