Start work on functional tests