Fixed test notification clearing database, added on-watch settings