Working on functional testing project
More work on functional tests