Personally, especially with this being your first cycle, you may want to lower your dosage and extend the length of the cycle.. 600 mg of test a week for a first cycle is more then enough,, maybe drop it to 100mg of test prop eod,, then you'll get several more weeks of running your cycle,, this means you'll get more weeks and thus MORE gains,.!
Believe at week 8 your gonna just start peaking and feeling great, the last thing your gonna feel like doing is coming off cycle when you haven't plateaued