Bonus is done and has been tested with jasmine