Further testing changes and wave output added