Fixes to test infrastructure to cope with faster controller