Fixed tests; added all waves (except noise)