Adding Normal and Bonus Test Modes