Dc/Melanie |#3100| Adding functional tests