Fix test
Break out into separate files, and add beginnings of wavelet