Added Spin-direction, Amplitude and Speed tests, plus file-options