Dev/pf2

Some small fixes to the CIMI tests needed to make them work against FT's CIMI implementation