fix bug with load throttling and more tests