[BUG #7897] Improved implementation of 'throttle' and modified unit tests to be less picky.