Merge pull request #24 from ualerts-org/AFDP-51

Work in progress on AFDP-51
re-enabled functional tests disabled for merge