Dependencies on pxi files not yet correct
Merge branch 'testdeps'