fixed tests after Marks changes
Merge branch 'devel' of github.com-oleweidner:radical-cybertools/radical.pilot into devel