More work on functional test