Fixed unknown override user message
moved some queries in various tests to the right place
removed some redundant queries in various tests
added some diff tests
added more notif tests for diff