I think you should do a couple of things you suggested. You should come in and train more to try to feel more comfortable with your skill level. ( If your body can handle it.) Also if your instructor is good and you trust him, you should listen to him when he thinks you are ready to test.