Fixing up some tests and also the sound/vibrate options.