Added bonuses and testing