Improve first functional test