Update wait-time and efficiency basd on tests.