[WIP] If/loadtesters rebase 3

Take 3 at merging this branch.
:warning: