Add option to allow custom sounds
Add test for custom sounds and rework test structure.