Code cleanup
Include or exclude test voices