Merge pull request #46 from DanielJMaher/bug_fixes

Bug fixes
CF Self Tests WIP
ACDD Self Tests WIP