Throttler test coverage, bug fixes