Got many FFT tests working again
A couple of minor fixes
Fix for FFT
Merge pull request #224 from izaid/refactor

[WIP] Refactor