Cleaned up Wavelet Tests