[KFSQA-731] Added a speed tag and fixed a few little things that were brought up during pre-merge review.