Added tests for FFTW, plus some format changes