Clean up notification modules, added setting for upcoming BLE tests