Removed fftw dependency from simulator.c and edited a couple of my test codes