External Test bugfixes tranche #2